This adds proper cleanup in case of a failure.

Signed-off-by: Stefan Berger <stefanb@us.ibm.com>

diff --git a/tools/xm-test/tests/vtpm/02_vtpm-cat_pcrs.py b/tools/xm-test/tests/vtpm/02_vtpm-cat_pcrs.py
index ab948b827d767df4f91e3a82d7b2a30c56705fd7..feeb6cb42a206540617385ade4695331ea15f512 100644 (file)
--- a/tools/xm-test/tests/vtpm/02_vtpm-cat_pcrs.py
+++ b/tools/xm-test/tests/vtpm/02_vtpm-cat_pcrs.py
@@ -46,6 +46,7 @@ except ConsoleError, e:
     FAIL(str(e))
 
 if re.search("No such file",run["output"]):
+    vtpm_cleanup(domName)
     FAIL("TPM frontend support not compiled into (domU?) kernel")
 
 console.closeConsole()

diff --git a/tools/xm-test/tests/vtpm/03_vtpm-susp_res.py b/tools/xm-test/tests/vtpm/03_vtpm-susp_res.py
index 793e4b2afc6e2808eaf3cb7594df77da273afef9..7e291763af68f067022bb550f9ed0a894d8d7a2a 100644 (file)
--- a/tools/xm-test/tests/vtpm/03_vtpm-susp_res.py
+++ b/tools/xm-test/tests/vtpm/03_vtpm-susp_res.py
@@ -47,6 +47,7 @@ except ConsoleError, e:
     FAIL(str(e))
 
 if re.search("No such file",run["output"]):
+    vtpm_cleanup(domName)
     FAIL("TPM frontend support not compiled into (domU?) kernel")
 
 console.closeConsole()